Merge branch 'bgo593793-filechooser-recent-folders-master'
authorFederico Mena Quintero <federico@gnome.org>
Mon, 5 Sep 2011 19:36:23 +0000 (14:36 -0500)
committerFederico Mena Quintero <federico@gnome.org>
Mon, 5 Sep 2011 19:36:23 +0000 (14:36 -0500)

Trivial merge